]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
panel: Don't chain up to non-existent parent vfunc
authorJonas Dreßler <verdre@v0yd.nl>
Mon, 4 Nov 2019 10:18:25 +0000 (11:18 +0100)
committerJonas Dreßler <verdre@v0yd.nl>
Thu, 14 Nov 2019 18:52:34 +0000 (19:52 +0100)
Just as with c35b4cede58142797b1f6b04a4e2e7eaa938234a, there's no
default vfunc implemented by any parent which causes gjs to crash when
trying to call it.

So return EVENT_STOP if the key press successfully toggled the button,
and EVENT_PROPAGATE otherwise.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/830

js/ui/panel.js

index 69882894cd8909e6be607d349a1d700156f8909a..e8e45b0abb5b1f17e5a1fc10b23efbcf8b844e40 100644 (file)
@@ -480,15 +480,15 @@ class ActivitiesButton extends PanelMenu.Button {
     }
 
     vfunc_key_release_event(keyEvent) {
-        let ret = super.vfunc_key_release_event(keyEvent);
-        if (ret == Clutter.EVENT_PROPAGATE) {
-            let symbol = keyEvent.keyval;
-            if (symbol == Clutter.KEY_Return || symbol == Clutter.KEY_space) {
-                if (Main.overview.shouldToggleByCornerOrButton())
-                    Main.overview.toggle();
+        let symbol = keyEvent.keyval;
+        if (symbol == Clutter.KEY_Return || symbol == Clutter.KEY_space) {
+            if (Main.overview.shouldToggleByCornerOrButton()) {
+                Main.overview.toggle();
+                return Clutter.EVENT_STOP;
             }
         }
-        return ret;
+
+        return Clutter.EVENT_PROPAGATE;
     }
 
     _xdndToggleOverview() {